Some API modifications.