Some API modifications