Added API components