Made performance optimization