Added notifications and logs