code review - refactor metadata objects as model