Fix to use 1.6+ auth_model if available