Models refactoring/improvements