Added support to manage keydetails