[TASK] Switched back to PSR0 for now