(*) Move API calls to class (cleanup).