Modified helper class