Refactored to group like API calls into separate classes.