Added support for all expansions