Added support for pre/post content