Add service credits tracking
Merge branch 'service-credits'