Added more classes from Kean.