@matsko This is a good point. Can we simplify this in future PR?