Add common helper class