Fixed importing and PatchValue call