Add calls to setup-core