Add notifications, remove memoizations