Fix 5.4 version error JSON
Optional security
Support more type