Added AdHoc classes