FIX: Better EL support