Added JWT support