Update wrapper tools to support psr-4