[PD] Separation of concerns