Added @API annotations