Adding better support for auth