Added border trailer and border leader functionality