More flexible dependency handling