Next step in metadata refactor