Return key classes from model builder
More refactoring...