Moving helper functions from config dir