Some updates for supporting metadata