Added double support