Add more for array and return values