Added per-line support - to be used for menu-driven UI