Roni | BSHR-447 |  Remove use of reflection