Minor modifications on core project.