Adding scrapping module + fixing protocol def