Add Calculator class