Issue #6: API for all models revised. Wrappers gone.