[#93] helper also adds token data
[#95] authoentication module modified