Added missing App::uses
Updated validation rules