Add helper class
Fix lines mixin