Additional fields for the criteria of entitlement groups would be a useful feature, for example all those on a fixed term contract or who have a particular amount of working weeks in their record.