Add key mapper and basic parser