Restored missing functions.