Added pre/post content support