added optional (callable) queryset to the mapping