Added before/after markup