Switched to use the declared ModelType and added a jira to later switch to a ValueWrapper instead of 'Object result'.