Added API for calculator