Use latest dependencies
Regenerate model
Properly handle EL API as dependency