Added notification stuffs to domain layer & data. source layer