Changed FbId to bigint