Add class and pre/post html fields