Added more basic classes