AI-539 : put "indicators" and "attributes" inside "properties"