Commiting changes of Metadata service

This closes #37