Added support for doubles and singles