Improve billing cycle fields.