Fixes resolvedSource and added Notification.ts