Add optional queryset approach on data-dependent methods

Signed-off-by: Don Naegely <naegelyd@gmail.com>