Model fixes

Changed some references to containments in order to make the persitence
more simple. There are, however, references to get replaced by
FEATUREMAPS because of the multiple interrelations. (see:
State--Transition)