Fleshed out metadata a bit