Implemented better support for meta-data