Fixed DBC & Map extracting