Added more before/after handler for manipulation/query methods