Changes to core for the new services code