Tweaked array concept
Fixed namespace and namming conventions