Added warnings and notifications