Updated the application to match the framework