Added the rest api
Shifted the data extractor