Improved S2P and T2P abstractions