Dev : clean up model name : Use code only for question part
Dev : did we add something like 'token:' for token table ?