Change structure a little bit