Moved to utility package