Actually after taking a look this should be part of this change. I will do it.