Added formatted lines, and line types