Added decorators for before and after