Just FYI we still got #293 open for refactoring link so we can/should take care of this in another pull request :-)