Updated to work with the latest rawphp/rawbase package.