New module for common imports
Refactoring: Introduce lenses
Ditto