Koya Model refactoring