Adding pause support