Add no-populate option