Updated castle core project