Maybe this could be merged into the existing metadata method? Not sure, just thinking aloud