Added boolean and double fields