Major changes to API and Process