Tweaked to allow Double's in composite columns