added more metadata control