Changes to support internal testing