Added service calulator