Added Calculator class