Adding features to support KMD usecase