Updated to match Kohana's convention