Updated to support different el versions