Some updates to handle Biblelator