More performance optimization