FIX: Add fix for depreciated class