Added before and after templates