Updated to compile against the latest core