Make expansions work