Updating API calls, making more generic than just MMA