Refactor object design on import.