Solved some performance issues