Added some of the tools for data generation