Small refactoring of Auth package for simple extends