Improve mock_storage, less host, new explicit lines
Add Line type to mock storage