Improvement in API args and notification emails