Tweaked backwards compatibility