Improved backwards compatibility