Performance enhancements and a setup project