(Xronos, Forge) Updating some classes