Added support for multiple core versions
Added support for multiple core versions