Added virtual primary user handling