Added more classes & uls