Added multiple notification support among other things