Enhanced some data for layout