Small refactoring to use options per instance. Add badges.