Updated format to give more structure to the application