Improvement for Boolean and Double types