Add better dependency constraints