Added boolean field and default values