Add support for post demo