Solving performance issues