Add helper
Fix bugs see milestones 1.3.0