Small updates to structure