Do better checks and do not include an interface that will be skipped to the known ifaces