Updated the main program and api to have the proper information