Added non-root support.