Added empty array handler