Add support of ArrayConfig
Refactoring