Optimized imports

Closes #6