Enhancements on notification module and CS