Improved backwards-compatibility