I like this better this way. Less object creation, and a flatter metadata structure.