Added missing functionality