Added support for "line" and "rect" items