More work on auth manager