[0.0.1] Added some infrastructure based code