Decoupling from infrastructure