Added support for EL 7