Fixed PSR-0 and made BIC optional