Added missing functionality.