Added support for long and double