Add CoreFactory