Making billing integration to be backward compatible