Use changes in CLCore