Change to Metadata as per pull request comments