Add preliminary capture mode support