Added missing 25 (role) attribute, junk removed