Make backend core PSR compliant