Add notification model
Fix bug