Add missing functionality