More changes to support dependencies based on ws id