* Remove old model stuff
 * Add MetadataItem