Added Joel's base classes.