Improved structure and searching