Further refactoring with imports.