No longer treating reference and user data separately