Add "convenience" support back in