Adapts and updates to latest Arcavias Core