Added notification types. No longer hardcoding user names.