Completed the SPF data wrapper. This will hopefully make it less buggy.