Added temporary core; fixed include files