Added controller and tag