Operational changes, updated for PSR-1 and PSR-2 compliance