Better support for Border Controls