improved meta data model