Added helper class