Get metadata working again