Updated to use the new API forced by the fix for the Postgres ID bug.