Add border support