Added more el7 support