Updated Demo to use the new services