Added API namespace back