MEDIUM / Minor changes in API