More performance improvments