Add semi-operational post expansion