Added implementation of calculator methods