Added double type support
Added constants support