Added registration of calculator classes