Network mapping operation (E2A) + few minor fixes