Added key selection and recording features