Meta data service refactoring