Implement proper order for entries