Update structure for PSR-4