Improved expansion support.