Added options for border and track