Models refactoring ( still to review )