Change from switch case to arrays
Merge branch 'array-with-dump' into develop