Added support to retreive keys