Added hash and class variables