Changed to object array implementation