Added a support for future releases