Added psr-0 support