Enhance Network code