Change structure a bit