Update for guard-rails support.