Added calculator services