Adapt to some more breaking

Version: 1.alpha.10.02

Signed-off-by: GreatEmerald <pastas4@gmail.com>