Import fix (following restructuration)