Made some improvements to the metadata