Fixed some crashes.  Updated the dependency resolver to use the new struct type