Updated refrences to core lib.