Extracted other utilities to separate modules