Add more data processing