Adding spider and spider_data machines