Updated rules to allow pre/post actions