Improve L2 Input/Output Feature Infrastructure and Usage