Added support for additional metadata types