Added some more infrastructure code