Improved Application to Infrastructure visibility