Infrastructure Interfaces changes