Added more module classes