Change: Allow models to be wrapped in data element

Signed-off-by: Christian Roth <christian.roth@port17.de>