Refactored with_badges API