Changes done by Tao
Added Node Mapping Code