refactor on DrawerCollection to meet the new API
refactor on DrawerCollection to meet the new API