changes for new APIs and better sequence diagram