Broke up coupling between BaseModel and ApiClient