Added binary base classes