Updated for Kohana 3.3