- Added better auth wrapping.