Same here, you could get rid of this class altogether.