Models architecture rework