Fix backwards compatability while allowing for forwards compatability