Ninja class changes