Added compatibility with SPF.