Added core project handling