1. remove unnecessory checks
 2. changed implicit classes for port-adapters be catched in more cases.