Added some more infrastructure