Added custom notification system