Added capability to handle network indicator