Truly support backwards compatability