refactoring, do imports by default
v1.1.1