Addinf before/after hooks
implement action yield