Update Comment & Country classes