Added changes for Lane Management