Modules layers added and minor changes on notifications flow