Add Client + isBuilding for bamboo