More performance improvements