Better psr4 support