Add a bit more infrastructure