psr4 and improvements