Add repopick and roomservice tools