@gkhachik, @tkolhar still working on the field, she will merge the two implementations in one.