Make core optional