Removed legacyResolve and updated issue managment system