Improved cancan support, added support for draper