Improve backwards compatibility