Split big notify into separate commands