Added more basic infrastructure