Update set with data for 2012 and improve structure