Updated API and forge