Updated Security\User annotations