Add support for expand.