Updated to work with latest Raven 3 server