Performance module related improvements

Follow