add mapping support for billable option
trim enum values