Added support of having boolean value also