Enhance/clean relational meta-model