Updated structure retrieval