Add new detailed-match property to define source and destination addresses to match on in each layer. Also add in-port as an optional match for the existing match property.