OneModelInHandlerConventions refactoring