Updated to run with MetaModel 4.2