models refactoringin progress