Does this class need to be part of the API?