Added shiro-token-based