Adding payload augmentation to example
Important refactor about app/services