Modified drawer-api