Added support for double type (2)