Updated array to be object-oriented