Feature/fix service demo