Moved imports in models file