Added support for Metadata fields + incremented version