Billing modifiers

The issue was addressed here. Please take a look.