8.5-before
refactor
replace array with object
refactor
add deprecation