Added users and notifications generation