Updated to match Kohana's conventions