Move properties collecting and sorting to helper class
Add better sorting of domain fields.