Added support for different expansions