Added boolean switch