Some changes to structure