Change signature & start work on adapters import functionality