added back semanticmodel support
tiny performance improvement