Add tagged Before/After hook support