Added support for coming versions