Feature/infrastructure definition

fixed #5 and fixed #6