Add bi-directional sweep2sleep support