Enhancement/294/metadata refactor