Added entity support for billing.