model refactoring due to endpoints KEY field bug/undoc feature