Update API and added Lang