Updates to latest Arcavias core and cleans up creating the context