Yep, i think it is possible.
It is better if you want to add it in another pull request.