[cyb-59] Changes to make library interface more consistent with Java library API. Changes according to PR`s comments