Changed data structure a bit