Adding Feedback service, and many details.
cahnges in test example