improved few classes->replaced reflective call with wrapper class, I hope it helps ide to goto source