MEDIUM / Minor changes and adds to API