METAMODEL-75

Implementing https://issues.apache.org/jira/browse/METAMODEL-75 Please have a look and merged, if fine.