add roomservice and repopick
for my convenience make dependencies general