Started work on the metadata attaching