Added calculator support