Big interface change; add deprecation warnings