Registration + refactoring Model class