Updated demo for new service layer abstraction