Made the extraction ready for multiple array configuratiosn