Add additional fields and sorting