Fixed import error after refactoring