Added before and after context managers