Added some untested metadata stuff