Added 'include nulls' functionality options