Yes you're right. 
I've started working on it. That will be another PR when it is ready.