Improved efficiency of Metabase adapter.