Changes to keep a list of executed API calls