Re-factoring of the meta data service

Add comments related to java doc generation

Please review and merge