Moved helpers to the core folder