Implement backwards compatibility