DAM-287: Cosmetic changes; including public role