Adding context_fee_grammer and source