Added Drawer class