Key class changes