Add documents and minor change the structures.