KeyManagement classes added