Adds ELF validation and partial mbi2 population