Notification model to concerns
Moved decorator into concerns