Layout related changes
Mock up for network inference