Refactoring to address issues exposed during load testing
0.3 release