Added controller and action check