Adding FRBR tools