Updated API and Document