Some refactoring
Properly using auth backend