Added before and after action