Add right structure and version