Removed dedicated adapters and simplified design for handling adapters