Added DFP, SR1, and more