Revamping layer 2 solution for better scalability