Thanks Dan ,
I think we wait to 5.4 release if it will be OK with our client.
It was really helpful
Rafi