Added drawing of lines and points