Improve Array Handling