Several model refactoring done.