Improved DMI.IN structures, removed unnecessary variables