include optional params if provided but nil