Small refactor.
Add any Bbprh extensions.
Add class diagram.