Switched over to the new metadata class.