Added more api classes.