After refactoring - simple arrays uncluded