Adding more data transform functions and making improvements