PSR-0 improvements