Updated AdHoc class