changed metadata design a bit