added some of billing support