Support EL 6 and 7