Move startup logic in Core