Added ability to query metadata