Adding border support