Move helpers down to base