Moved helpers to their own file