Interfaces, adapters and mappers
fix merge