Starting to add support for badges