Updated with Network Handler