Added support for more versions