Counter-terrorism measures to include banning ransoms