BUG-7464: Add dedicated key set classes