Added asynchronous before/after calls