Updated to work with more nexus files