We need to resolve dependencies a little earlier