Improved : Changed notification methods interface