Bring in endoxa-core