Adding more classes to help with sending the data