Better abstraction for interface matching
Small improvements in interface matching