Some changes to the structure