Added long and double.