Some models refactoring