Improving API and preparing for global_data and since_last_call parameters