[DF-2856] Added Waiting to library