further shiro integration