- added key and label maker wrappers