Hello, Andrey.
Thanks for review.
I have updated comments according your review also renamed some fields forconsistency.Additional some notes added to documentation.
Updated patch in attach, github updated too.