Make backward compatible