Datasources\ArraySource: Fixed & Improved