Update to support rhel and more complex config