New helper class