Added metadata options

Not tested yet, but it should work