Added additional parameters support and some timeout restriction, which is not tested yet.