Added boolean converter and notification change