Changes to more fully support the API