Fix interfaces mapping