Class inheritence was slightly changed