improved and unified some adapter classes