Removed array handling