Move to S and T instead of P
Improved S2P and T2P abstractions