@ykzts Any recommendation? I think I prefer your first option. Could you send a patch?