Added API annotations