Performance improvements
build update