added double support in data object