LPS-46205 refactoring of api for become more easy to use