Merge "Added conntrack matches and Refactored code"