Added some structures for tracking lines, bindings