Upgraded lib to v0.0.0.20 and adjusted the calls to match the refactored lib
Authored by: i-campbell 2020-09-11
Parent: [r336]
Child: [r338]