Yes that sounds good. Let me send another PR for that.