Added slight support for Double objects.