revamped Auth Module