#273: Updated demo's to run both raw and generic services