Added proper notifications