added JWT support