Added a helper class