Fix model dependencies imports