Added some more data processing