Updated to work with gofer 2.x