Changes to allow load testing