Implement reverse compatibility