Simplified the authentication model slightly