Move all methods into helper