Improved backward  compatibility