Added before and after fields