Public profiles refactor