changes for Drawer support