Add support for future 4.1