Added missing functions