Improved 'once' mode support