Refactor models for common type handling