Added better parameters support + some improvements