Fixed imports from refactoring