Added Calculator and removed getCurrentDateTime