Add more helper class