Added more classes from the bundle template