Updated data strucure and sub modules