added full support of auth