ONL-specific changes