Work towards dual-versioned lib - #2