Add metadata d,a,t,p,r, part of #19