add class helper class
improved dynamic controller handling