Updated to fdb version 2