Add before and after macros to the CoreDSL trait