Re-added utilities