Removed dependence on invenio