PSR and composer modifications