Optimized the performance of the app