Added calculator interface