Added some nominal infastructure