preparation for auth refactoring