Updated system to subObjects, subArrays, reduced code