Added a bit more technical bits on the infrastructure