Added Token Service
HQL fix
Column name fix