Added 'metadata' parsing