Modify drawer interface

Retargeted pr to api-breaking-changes
Old PR: #947