Added adapters and solved conflicts