LineStorage branch for performance and coverage improvements