Some changes on structure