adapt for gndlib-v0.1.0