Adding RHEL-7 support