Added psr-4 support