Added better border support