Add geppetto infrastructure