Should this be moved to Util?