Added conditions, sorting, ordering on related properties