Add max-wait property for each reaction with optional handler

Add max-wait property for each reaction with optional handler #1246