Adding some Shiro stuff