Fixed scala demo to use the new services