Add metadata and other such crap