Added support for border