Added boolean and double values