Calculator class added