Reorganized types