Improving backwards compatability