Refactoring production to new types and updating Import