Completed refactor after bennu upgrade.