Split controllers and add user helper