Performance and testing improvements