[PATCH] import enhancements