Set2DArray handler + refactoring

small refactoring + added Set2DArray handler