I plan in in future request, as whole code needs adaptation to make clear what is public and what is private API.