Added provision for boolean values