Meta data service improvement with code refactor

Fixes for STRATOS-998 and STRATOS-999

This PR contains-