Dirty implementation of new infrastructure scheme
Dirty implementation of new infrastructure scheme