Refactor structures and index improvement...