Rewrite before and after hooks using decorators instead of confusing method names
Update with new before and after hooks