Feature/after hook