Modernize Order statement for Entry