Add border handling helper structures
Test