Made drawing handler more usable