Update UI to handle Map value and sub type models
Merge branch 'polymorphic-fixes'