Added additional filtering capabilities for inbound/outbound