More psr-2 improvements