Adding some performance changes