Re-factoring of the meta data service
Re-factoring of the meta data service