Resolve Assemblys -> Better handling