added modular auth