Changes for new gollum-lib