Enhancement/294/metadata refactor



<!---
@huboard:{"order":220.6015625,"milestone_order":310,"custom_state":"ready"}
-->