Added code to cover all the optional items in the data array