Maintain compatability with previous versions