Changed location of default 'affiliate_id' definition