Added validations and warning notifications