More updates to support dynamic selection of disk resources