Made risk_category_id optional input to calculate service (not all editions have this)