Moving helpers to separate modules