Changed system_core to own forked one