Added the calculator structure