Removed WrapperBaseDriver, fixed SimpleDriver encoding