Fixed service uris and added store samles