Moved a method to different helper class