Changed the data structure a bit