Format update to allow more key mappings to be added